change to items and lists, add tests for components