Circular dependency fail. zipped this up and going to try to go from
when it was working.