Refactored, basic list added