Rewrote rules. Fixes #15
Rewrote grammer. Fixes #15