Readying for Inferno's commit
Merged well. No problems