Added more CAD routines.  TODO: add tests?
TODO: add more generic plotting routine for repeat calls.  (Ask Toby?)