Initial commit of ExpressionTool - not connected up yet