first commit, ground up rebuild
merge conflict resolved