Solar System Formation in the Context of Extra-Solar Planets