Still some edge clean up, but should come out right in the end.