jabberwocky almost done!

Can someone else on the team take a look? Sufficient to merge into master?