- added todo comments
- reverted out config for IntelliJ Idea