More UI and data store work.