Restructured addMove, fixed dictionaries.