added jframe client and wasd and merch buy and sell