Got saving cats mostly working