Did an entire extention overhaul