Added some expressions and parser
Merged