WIP use serialised instances for all not running states