Make Some Changes

Make a few commits and then try to squash em.