Edit page works-mainly commit so Paul can fork and look at this tonight