Partial sound commit
Sound first pass