WIP: bigger classification + clarification