Finished moving to new class