feature/postgraduate compatibility

Tests pass! Opening.