Attempting to finish this mess