Import Statements

Implements #72 with some minor structural tweaks.