Added bumping Elasticity as a TODO