Added Curtis's stuff to build.