Introducing a StateWrapperClass (in progress)