added prep for xmvn
more xmvn prep updates
only build core for now