Got most of the UI to work