Starting to add script running support