Pulled out the tss and fiddled with a few things, work in progress