forgotten imports
Quick commit

Going to ask on StackOverflow for help. Leaving this branch for now and
will roll back the master to a working state.