Added constructor, code still incorrect.  Mary, fix this