Removed existing code
Pushed in stuff from jjl/oyster (about to be defunct)