Added loads more stuff. Updates to report. Nearly finished