All tests passing. Resolves #8