WIP -- removed demo widget