Many changes.Currently unfixed, need to save
class deletion