Intermediate commit (first draft of atttribute-types combo in property editor)