tracking down places where we need to import some function that was previously covered by a * import statement
a little reoganiztion and tidying up