Dave's EditClass

-Here are David's addition