Closes #11 - make methods protected