moved stuff around; not sure if rect collision code works