finished reports
dang merge conflicts