updating to reflect reorg
removed swap
the beginnings of more to come