update sellar problem
merged david's stuff. lots of conflicts...
cleaning up merge conflict stuff some more
fixing stuff from change to sellar
merged changes