Made progress on hitboxes