Progress made :)