Adds cat calculations. Midje has been thrown out too.
Merge branch 'cat' into dev