Started work on device specific code