Adding more stuff on TODO