Revert "Revert "Added 2nd collision checker, gravity adjustment""

This reverts commit 0ad841ad6190b40362f8508fc232531eadb2a9aa.
Revert "stom"

This reverts commit cfe6d5f45543d47456864bbf9e6e92bb6f824afb.