Changed constructor for subclass. Closing #8