Commented out a line
Made queries into a transaction
Merge branch 'Thomas'
Changes. cuz we like that.
Merge branch 'gordon'