Planning updates

and some client server stuff too.