Got the main part of the final falling stuff in.
Merge remote-tracking branch 'upstream/master'
Trying to get this on github