Working on #1 almost there.