+1 on the merge I agree with Katie. We do need to work on the wiki pages to clearly explain how all of this will fit together and how the architecture will be maintained going forward. --> towns