movement working, working on more logic