Refactored into more atomic rules
Switched to fancy bracket syntax
Added rule for multiple expressions
Added methods