Some changes to get H working, but needs to pass the tests now