All works. Should be final commit for a while...