Good news everyone! The developers have made considerable headway on the new Tokenswap & Poolstake contracts, testing & work on the UI is now in progress. You can see the Tokenswap working in our discord announcements channel.