Cleaned up the cat stuff...
Same commit as Lorena. Created a clean merge.
Merge pull request #25 from jncormier24/develop

Develop