final push for friday, last two pieces of footer yet
merging?