UPDATE 9:01PM 5/21/2013

Several changes (incl algorithmic details)