Drop this for now, and can discuss as part of the other pull req