Beta 3 - appears to be all working.