Added new "Swap Type" to main wip file

Still needs clean up work to remove duplicates of some global lists.