TODO updates after client demo. Some Reports changes