Final Commit

(for now)
Had messed up some extensions, now it's fixed