Add imports

This is one of those things where git add -i actually screwed me over,
big time.  Sorry about that :(