Fix up a hanging function in State
WIP on StateT