map components added (not completely)
Revert "map components added (not completely)"

This reverts commit 9a11bb450039b29c4224bffff00a5ebc9b52e5a4.
map components added (not completely)
Revert "Revert "map components added (not completely)""

This reverts commit 36955ebafb3f0499323e240e67abbd9f17f90ad8.
map components added (not completely)
map components added (not completely)