progress. There is a bit of work to be done here but in the end it may help. This is not hooked up to the build yet, it should be fleshed out a bit more first. Discussed with: rwatson (phone and email)
