working on fixing the collision...
commenting, tried to do something but too tired to even try