Continued on the pvmas refactoring. Currently builds, but doesn't run.