Move comment
WIP
Harder than it should be
Duplicate most of existing functionality
Add customer requests