Hcp branch

I've never done this before. I really hope I don't screw it up!