Initial commit; tests forthcoming