Redid Xbee as well as moved things around