2FIFO/Custom updates - passes tests, CUSTOM FAILS ON SORT

Made a ridiculous amount of changes and got 2FIFO working properly.  We
pass the tests.  But custom does worse than 2FIFO on sort.