Created by: cbusbey
Implements #253 (closed). Includes some misc refactoring in files as part of feature impl.