Changed to device object model, started adding better device testing