Some todo comments