Happy path for the refactor complete

- Lost some features, tackling those next
Agents emit timeouts