Merged in some other code. It handles the grab map.
Data namespace integrated.