everything but the secret page works.  May need cleaning
fixing merge problems