labour: wip: state overhaul