Finetune, added Transform class skeletons