first pass of 20140523

may need to rush this out