Started re-implementing core features as a task-based finite state system