Cat-apps

Branch descriptions master: Merge into for major releases. prototype: Merge into when prototype is working and significant updates have been made since the last prototype. catsim: Do work in this branch. Almost all commits will be made here.