Update to working version

Clicks in at 12,977 lines (non-comment and non-whitespace)