initial commit to bring in changes.
pulled in libs
merge