Towards issues #6, #10, #11