Thirty-First Commit

Added the beginning of maps support