Hi, No time to check it deep, but I would say... please give more significant names to the new classes & methods (or a small comment telling), as well as // TODOS, what's the TODO task. Regards, Rafael Fernández López.