Work in progress, need to checkin for real device test.