Few TODOs
 - commented code
   - uselse for a moment