Move around some stuff; add some notification messages.