Tried to find a bug
Fixed constructor bug
Initial checkin