Throwing more code at the problem, while testing it in an example express app. Getting closer to something releasable!