Added GUI TODOs