Finished class, final commit