started lm prep
Merge remote-tracking branch 'upstream/master'
reorg
last x works
Merge pull request #2 from tristantao/master

prep for lm, almost ready.