cleaned up crap and simplified the startActivity to not do startActivityForResult