Moved stuff around to get it working from clone.