Changed spec. Still not quite ready to finalize