vasi/brewfoster 1 commit