WIP: Updated feature plan.