mostly finished the report
misc
merged