added some menu stuff and some cut and paste for later