Added some more expressions. Some rough edges to work on