out of office commit

unfinished commit for developing in haste offsite.