Added CAD
Updated with material from thesis.