Fixed #2, wasn't requiring data folder to match device ID