add baseactivity and stuff