Trying Cadair's first attempt at circular import fix