Fixes class errors--needs review