cautionary pull
Merging in Greg's stuff
concurrent world updating
Pre-pull commit
Integrated Greg's stuffs
Yay for really ugly blocks