MAJOR REWRITE

Shifting most processing and building logic to the new Target class