closes #20, add class support for models