First pass at really clean, 3rd party builds.