working state. added lots of broken future features