Updates

Remove unneeded TODO
Switch things around in main activity.
Not quite working, but need to do other things, so archiving this state.