Merged the two Base Classe sets

GetXJawns still isn't fully implemented, and it isn't fully polymorphic
yet on the Android side