change some naming, playing around with how subs work