Add a couple things as todo