Finishing up the basics in preparation for a merge.