Type concepts consolidation

[MPhilofsky (Melanie Philofsky)]

And please give some thought to this discussion and this discussion

@Christian_Reich