Outline basic structure
Merge branch 'rebirth'