switched to use of Angular framework for state flow. Old implemenatation of state flow is still includes - needs remvoing. New state flow is rough but incorporates core single screen state machine using Angular. Bug introduced need to be fixed before adding new fuctionality