refactored out Map<String, Serializable> in most places...still working to get imports / tests right
quickml passing tests with the refactor