- started restructuring move parsing