Started work on collision resolution