Closes #104. Work was done on #87 but the actual constructor was never created.