Fixed classes a bit

Seriously why was a while loop there.