Endless Mode work

What’s left:
- Animal Capturing and Accounting
Merge pull request #269 from ebbyw/Ebby

Endless Mode work