works-ish, let's try turning named on :)
Added proper static-stub support