Issue #32 - moved one off utility scripts into more entity like scripts.