Preens testing order
fixes map instantiation issue
Preens testing order
Adds map initialization code