WIP. Capturing state before moving on