Rehauling .ino code to work with new header