All Alan's dev summit changes up to Tuesday morning

@doneill I've switched to this new branch because I was having trouble with my old branch. Forget the old one