Pretty much finished.... clean-up and re-make the extension