Whoops, last commit had a circular import