More things! EngineTest still unsafe.  This was made a while back. Just wasn't committing.
Merge branch 'master' of https://github.com/iburinoc/LifeSim