Added stuff from Jake's VM