major changes including move to android studio