This'll probably merge conflict with a branch I have that refactored this UI, but w/e.