WIP on move keys

Some work on #99