SwappableDsAPP now integrated into main