Now that boost seems to be running with you @xchrdw, we should merge only when this code is moved to tests