Status updated
TODO updated to reflect latest changes