Update to get tests running.
Update import.rb to require year. other stuff.