Finishing up the first commit