Work on #24
Work on #20, adding model type facet