WIP initial version.  No icons yet