[Issue] Working on #8.