Added all TODO