Stage 1 working

I think this will work
Merge pull request #21 from DonoA/TS-full-integration

Stage 1 working