Issue 1 and 2 need two be swapped. In the app, 2 should be 1 and vice versa.
Fixed!
Thanks @CLZ_Justin !!