WIP Extensions, almost done. Bye bye Manali