added ExpressionBuilder and a text, refactored Calculable to Expression