Added some basic collision resolution