Overhaul of footprint wizard helpers
WIP: Inline headers