another WIP structural commit, still in design mode