reorganized some methods into partials, added addChores form