WIP view and controller update.