Moved character controll stuff where they belong