Bring this into a pretty much working state
Snag the final menubar fixme