Initial work for port to Raspberry Pi