GUI: Added a TODO