Merge pull request #2 from tristantao/master

prep for lm, almost ready.
got team sub hist
realizing that lm aggr won't work as intended
fixing lm generic so that lm aggr can work