Preparing for peewee database transition - much cleaner results than trying to have our own ORM