Local changes
New fifo implementation. A bit buggy as of yet
Fifo done.
Merge