Reviewed code, added TODOs