Reviewed code, reviewed some TODOs