Speculative commit to test data retention with updated UI
Added persistent data storage, and fixed crash
local commit for merge
local merge