Reverting changes to days before functionality

Was progressing down dead end with idea for W/C, need to re-think that
logic