restructuring for peewee (broken)
trying to fix setup