Working on the new classes and fixed the computation routines