huge refactor step, post hunt 2014