10.16 update

50/50 shot of running without crashing, but functionality is all there.