Added more todoes