Started Work on Smoother Collision

*Fixed issues with jumping
*Smoothed out collision(still a bit of work left to be done, it's not
complete yet)