Towards Komodo 2.0