Began implementing ticket #39