Merging all the commits i knwo how to di it now.