Issue #5 and #6 - giving it a try