[WIP] Initial work on making Aviator provider agnostic