Serious re-write of intro, other additions