Huge change, and it's almost working, too :)