TODO added. Step to nice flow for all of main content.