Added some stuff, still not quite working. Local->global not doing it, yet.