Added first-cut of windowing and pivoting options.