Reverted back to a strange place. Need to redo this anyways. Commented
out old code.