WIP Panel (Do not merge) 

Rebased on top of changes merged in #1421. Just want to get travis going and look at the history. If ok, I'll force push onto the existing PR.