Overlap issue resolved, collisions still not 100%
Proper testing system is definitely needed :(