Added publishing mechanism
Cleanup/reorg of prototype