Debugged and fixed

Debugged and fixed the on the actual hardware. Should be properly
working now. Still need to address the need for id.