TODO/Ideas: Filtering + Example
Remove no more needed commented code