Pushing this forward like a dream. Added Android fixes & other tings