Adding the general logic, some bugs to fix, crapy collisions system AAAAAAAAAAHHHHHHHHHHHHHH