moved some things around; took in import file; seems to be working as I understand the problem