Implement Cru & Student Status for Cru
Fix conflicts