Nice job overall building this new class, looks great! +