More work with some mistakes I had.