Getting ready to actually clean these scripts up