Adding more functionality - Moves unfinished