Added more facts
Simplified code
Finished code
Update to Jordon's latest code. More work on report.