Added smooth movement
Moved alot of stuff around