WIP expanding expression capabilities

@todo: Rename *Expression to *
       Tests