Improved Surface Performance significantly. Whoop Whoop!
Merged conflicts.