WIP introducing threaded states