More refactoring but now it won't fit on the Yun :-(