WIP - working with dictionary based setup for saving - edit mode ok.