a refactor and note about how the hook output is really hurting progress
um, this is a blocker