Simplify draft script element
Add first major cleanup of code and testing
Add test runner command to pre-commit hook