Full Implement Issue #6