ceedon@ working. Need to harden.