Issues #4, #6, #7, #8, #9