be more explicit about information as it is passed around
Merge branch 'clean-up-api' into autostaging