Code Update

Map object framework assimilation begun.