Working on getting the device ready for production builds