Safety checkin. Still dealing with State state issues not working as expected.
Added a State tracker so that the system will remember where the user left off.