Tested and working

Includes dongle

Some scuffs