#99: Fix constructor to take appropriate arguments.