edging towards workability... may undo this commit