Feature/v1 fires