goghvmu update

First push, converted files to match goghvmu