untested goodness
making progress. still a couple of issues
this set of changes was made on an iphone at the beach