currently using a bunch of helper files for this... but this does sound like the sensible next step!