and even more todos