Continuing more work on the scripting engine...