HH-29111 ironed out bugs, refactored
HH-29111 more stubs and error messages