Most of shawn's report stuff done
merged in James' changes, added Shawn's work