Final Commit. Merged extesions with the normal things!