New stuff! Closer to working. Need more coffee...