Intermediate commit as I continue populating the sidebar.