Add more surface stuff, now with more crashes