Added map, working on schedule