Fixed collision property jumping

Should we make collisions and keep upright properties the way gravity
property is done?