Jenkins1

@thbishop this is ready to merge as well