Started moving WCS stuff to MVP.