Latest

Combined now has the latest (but not finished code). Alan and Rob can
look at this now.