Added UI and tests