Ok refactor list properly