Getting closer, heavy changes to mapping

Probably still another 2 weeks out though