The import scan is not pretty but it works. I want to check this in and get the messaging system built out.
Fixed some broken tests.