DS Project 3
Almost final version