Working on test/class switching stuff... getting better, still dirty as hell.