Almost there!

Only thing now is lightning issues when running on device