Updates from working with WSNelson