Did a bit of refactoring and fixing some stuff in both VM files. About to do a bunch of revamping, so doing a commit first