WIP overhaul. saving my state