Nonfunctional build, fixes #14