I finally got around to seriously reworking this one...