Fleshing out state tracker a bit.. Still inoperable