initial grunt work for new architecture

nothing works!