refactored moves to use string again in most places