[WIP] Refactor to use loop indefinitely