Closes #13 adn closes #14