Working on #60
Working on #60