Tweaks to collision handling + initial commit of Direction