Script additions, refactoring, etc. Lots.