New Expression system, first draft
Forgot to commit new files