Added a reminder to do
added logic to show status