Completes issues #11, #10, #9