Rolling back the version of the output file on master, as it contains David's layout changes. I will move over the database queries later. They aren't needed at the moment.