merge a bunch on unmerged code, prep for major rework.