Initial work. Still lots to go.