moved stuff around, got ready to merge with arduino code