Makwa User ID tracking

Job well done. Worked with Thomas on Several occasions and will continue.