Bit of a cleanup
Add menu scaffolding
Splitting off into different files for my own sanity