Updates with scripts and testrunning
Before weekend checkin