Added Client only models. Fixed some stuff.