Still tweaking my code to make use of recent framework changes.