Work on About VM
Splitting move into 2 phases

Some tidy up