CS for hathor

@Bakual I add a @todo line to the code.