Add kittens
Merge branch 'feature/kittens' into develop