Updated files and tested some of the functionality with driver and device-lister.