Prepping for new Client ( 0.6.4.0)

Preparing fork for new client code.