Celebrating Scotland sticking with the UK (also, some database refactoring)