WIP save and check steps