Got things properly merged and compiling.