See if we can think of a cleaner way of defining the base models so we don't have `*BareModel` and `*Model` + subcollections

See if we can think of a cleaner way of defining the base models so we don't have `BareModel` and `Model` + subcollections