Working on some major changes to the UI... currently broken, unfortunately, but commiting just in case