Change flow of logic. Still not there yet.