Top down progress
Merge master onto peter, resolved app_entry conflict