Resolves #96 ... mostly