I tested Mentor.php and fixed a couple small bugs. It seems to work perfectly fine now. The only part I can't test for sure is the call to removeMatch because it has not been implemented yet. Good luck on your individual parts.