All Calculations work

All calculations work just need to format the results and things will
be ready for the alerts to be added