Add ideas and perform some refactoring