added more swing stuff... ugh