Added moving around and stuff