Feature/moved character logic