working demo and some cleanups, though not yet tried on ssb