Added a TODO, so we don't forget that we need another validation done here