Fixed basics TODOs