Tries to use Map properly. Background does not display properly.
Merge remote-tracking branch 'origin/develop' into develop