I re-wrote 80% of rest router. don't try to read the diffs, just treat it as a new file