Added DoubleRewrite etc
Merge branch 'part2' of github.com:killje/Expressions into part2