Add in some more todos