Teiiddes 1755 and Move Refactoring Fixes

Tested to solve immediate problems but needs further testing.

Design decisions made in commit messages - need signoff.