- put in basic structure
- moved everything to top level