Tons of refactor, catmin shows cats