Dropped the Limits and replaced it with categories
Almost complete... Some tweaks are left