Moved graveyards into a class and changed to instantiated it