Forgot to use a variable, also add TODO reminders.