lots more re-jigging. tired. bed now.