trying to rearchitect code for transitions. Not complete yet still many changes before basic testing can commence