Started work on editing classes