First working version, now testing.