Start to fix flagging, begin admin side