Working, still ugly