HRVSTR Golf

While we're making changes, hit em long and straight.