more giant refactors of vmctl