massive commit, added meat to the UI