aah screw it here's rest
Did no gap-filling though