I started to do this along with pull #35 but quickly found it to be a larger job than I have time to tackle this evening. Added as a new task.