Added two great classes!