weekly commit before big pull from Jon and Brian