Initial work

If the commented out code is not needed, best to remove it.