Since you are making such a sweeping refactor, we may as well try to keep the grammar correct, s/does/do above please.