TODO Refactoring Strip scripts of all superfluous code Tests Fix tests so that they run correctly from new locations Add additional tests