Trying to get everything back together, working to a point.