A few bug fixes, and a bunch of code that almost works.
Merge branch 'master' of http://github.com/LukeShu/leaguer