fiiiiiinally up and running again.  death to circular imports!