About to do a major cleanup
Much cleaner, more versatile, and less offensive to me