Complete #941 - Need Testing