Yeah that would be good. @hartz actually already suggested that but I pushed for getting the basic feature in first.
@hartz would you like to try and get this working in a second PR? If not I can take a look at it.