Improving Contraction class. Currently not working because in the middle of changes.