Added calculation methods, a few more to go but this is a good start!