Adding in dataviz, data import and mapping modules