Working on #14 #2
Working on #2 #3 close #14