Further code modifications to set up for first compile; need to merge with master to get the Hv files