Immediately changing class was looking weird. Figure out a better way.