Added some basics to the new classes