Beginning of new extension infrastructure
Round out rkit extension infrastructure
Remove old cruft to make way for new stuff