Ref #38 - Should prob make these methods public