Merged code and began removing duplicates of overridden methods