Flyout
Prototype
reorg of code