Issue #6: added TODO; also some changes as consequence of switching to laptop