trying to pull working master

getting up to date so that more trouble shooting can happen.