#26
Reorganize
#26
New grammar working
#26
Abstractions and a test
#26
Database fixes
Merge pull request #27 from rjrudman/26

26