Crtp

Hey Steve.

I added some more changes. The last commit might break thins on your side. Please let me know what you think about it. 

Cheers,
Hauke