temporary changes to work with dave's prototype...

need to merge S1 and S2 versions, but don't have time/energy right now.