Busy at PTE

Almost ready for PTE!