Attempt to get everything working again... facepalm