Updated Status and added TODO