On and Extend are now const correct.
Moved namespace wrapDeviceGrid to its own file.