Big refacto, new class stucks to manage stuck