I'll be working on this more (as I to finish the tests and nutupane integration) so I'll take a look into this then.