WIP for dependencies, save state for heisenbug