Extension working, plus a bunch of other crap from squashed commits