Updated Status and TODO