A lot more progress on implementation, ready for views.