Add main logic
Able to push
Merge branch 'bootstrap'