Initial Z3 tablet commit

replace castor with scorpion