Added TODOs
Backend TODOs
Backend checks now