Work in progress, more devise stuff