Testing the waters

Change-Id: If597864e743ecd1ec280e70c536ff0e7b3ebd237
This would be usefull

Change-Id: I4864cee510cf12e09297ef7f1528b89218437a76