Minor fix
Temporary commit - Write using the new format - still cleanup to do and
conversion around assoc list
Improve on changing the mapping of getters
Progress...