Feature/move to method