Added some TODO comments to show upcoming development tasks