trying to fix class stuff