Working on moving all logic into griffin