Assignment - Functions

Changed all calculation numbers so they match through out the various
functions