Clean up of swapping function. Most of the Roadmap is now working. Bug hunting begins...