Move adding script stuff together