put model categories in the right place
finish feature for model properties