Issue #121 - Finalize UX and backend