Merge branch 'feature/lists-mvp' of https://github.com/DimitrisVainas/combogen into feature/lists-mvp
Refactor old deprecated code
Add to lists hack
Merge branch 'feature/lists-mvp' of https://github.com/DimitrisVainas/combogen into feature/lists-mvp