Messed around with some Swing