updating to latest and commenting out class handling