Adding global functionality in slowly