Started rearranging into a more longer but more readable way. iOS target...

... probably doesn’t even compile but I haven’t checked in a while.