Import initial map cycle code
Merge changes from 236
Revert removing everything....
Merge in community changes