Add rudimentary collision handling