Inline everything so I can restructure