Fixed #1

Now working on implementing the UI.