added Waiting States

prep for Maincontroller