Started work on the OUI functionality nearly done