More work
Finished the first pass