Moved some methods into helper classes.  Updated TODO.