Refactor, Moves array with getMoves functions added