Some inital work for the Scripting refactor