Added base fragment, some clean up