Agreed, howevew I've made this stuff more generic in the added commits.