Undid everything. Can't make the circular reference work.