optimze 'n shit
Merge branch 'feature/optimize_collider'n'stuff'