More work on first pass