Update with crude and quickish mock so stuff can test against the basics without going through hoops.