adding in three new classes