Added a couple more todos