Borders added, collisions work