fixing some models, trying to get class-switching working back to plaid