Refactoring state-status, consolidating calls and fixed nested transaction. Probably broke rollup...