Added sections and headers. Deleted all savedComponents stuff to better reflect err'thing