Some quick tests post merge of rgchris PR