move calcs
ready for feedback page