Updated to use Lists

Based on feedback from @kriskowal, switching over to use a list.