Split TODO bit into separate file