main activity rough draft
fixed merge