Added basic user-interface