final version, UI completed, test works