Cleaned up. I've got two branches that do the same thing in different ways. I don't want to admit but I may have wasted my time.