Merge back from develop

Is it the future yet please let this be the future we wasted so much time on this