Added some globals; need to add dependencies