Created a new version to deploy locally, some comments on todos