Refactor scripts, add baseline