Started work on collision and map bounds