Part Way through State Pattern