Moved Kitty stuff into separate module