starting to refine modules
refactoring
refactoring
approaching unified scripting codebase