Map creation and parsing/internal management complete, also added new Object encapsulation for easier error checking when retrieving elements from objects
merge