Work done in class - more maps loading