Feature/border collision

Merging to get rid of