Some todos added.