add moves support (not finished)