closes #11 ...finally