removed mainactivity extension on classes that dont need it
trying out a few new things