Seems to be working, any bugs may be related to surfaces now.