a ton of shit that probably should have been multiple commits.  you'd think i'd have learned to commit more often by now