Changed a buncha stuff, and added a CAT