Changes to support side-bar

Not done yet, but figured I would push what I have finished.