progress on remove class - will return to complete