Fixed a circular inclusion bug, more work on getting this sorted.