Initial commit of prior to fixes.