finished model class changes, added witness classes