I think I just merged the code correctly w S&M's