More granular import. (still needs work)