These diffs are going to look really weird because I changed it from a JDialog to a JApplication, but kept most of the other stuff the same.