Progress on Surface (still wip)