[DONT MERGE YET] Merging in Danny and Milo's code

Don't merge until we do a good code review to ensure no settings in Adruino env are broken.