Got the global mapping somewhat working