Does the current setup handle categorical variables? It seems like we're treating them just like ordered numeric variables now?