Pondered the API and figured out where some things should fit.