merge in some of Jons stuff