[#42] Finished refactor to use system provided ID rather than device MAC.