Properly filter out subordinates
Updates to subordinate tracking
Patch tests
IT'S TIME TO DO THE RIGHT THING