Rewrite to include Extender+ features
Renaming repo