Expressions now work
Preliminary work on comments