adding basic UI
merge conflicts