Corner collision finished

Still needs some tweaking