WIP
Merge branch 'work' into weakcallback
Work in progress with working, silly test.
more wip
Fixes.
Stuff