Added some validation scaffolding, to be expanded later; should help with issues like #36