move and refactor vm analysis

Requires #1177 & #1173 
Ah, yes, that would not work. Did not know the cause of the wait :)