Start adding kitten mode toggle
Cleanup