Update Sunday

Almost final commit.