Began adding list support. Reorganized.