status: Refactor to support multiple modes