This is the first cut of the Sub-list functionality. Minor fixes were made to other parts of the code.