Complete first pass of SUNs

Still some gaps