add move tags, and make it more pythonic