Beggining of suggestion, problem with subclasse, see that tonight
Update branch n1