Changed TODO to reflect whats actually happening