Major re-work here, all good now.