work in progress - just saving state