reworking stuff
collisions should work better