Updaing list on new idea, might need to refactor