Working on #43
Resolving #43