CS for hathor

I will do a "normal" PR with Tracker etc. if we merge this. For now i don't change the Code.