ticket:1 Almost done