Update of latest changes - then its time to get cracking with those awful errors!