WIP
Restructure to bring back inline