Removed sysout, added TODO