bunch of changes, committing because im going to change the guit o use jpanels