full move to peewee