step four
added condition checks to decrease panic
Merge branch 'science'

Including experimental improvements so things can panic a bit less.