got first pass working