Finished all TODOs in mainactivity
Finished all TODOs in mainactivity