Master: actually added those things I said I did before.

  Also, have a StatusReport class!