Build out traits

add traits types to expressions

simplification