First minor attempt at breaking up the import with some testing.