it saves fields now, some cleanup, todo and thoughts added.