Progress on Issue #11 and UI for Issue #12