WKT

pull for #33 work in progress, don't merge.