first commit -- still a mess