Finished initial pass of object collision

Just working out the kinks to go