Moves wizard

closes #7 and #5