CS for hathor

Thanks I add a todo with my PR