Finished up Modify classes