HV-725

Maybe time to get some of my initial changes in