Resolves #12 - UI work