Cleaned up and fixed some of the functionality. The VMP was not using some of the its own entity based functionality