Progress on Competition Edit (NOT DONE)