type hooks fleshed, tests still failing