Big update, ready to test again on the live site.