started on collision detection and changed map to make it simpler