refactor a bunch o'stuff with Mr @MaxHarlow
update canary