Drjt chapter2

Adding Chapter1 changes and Chapter2 changes
Could make this slightly more efficient by only doing the calculation if the radius is above zero.