Added some TODO comments regarding output