Move everything to Saptapper class