Make Sure All The Components Are Accounted For

Make Sure All The Components Are Accounted For