WIP: Cleanup predict primary loop