major overhaul of systems.  Stripped out much of the composability stuff for now