Issue #419 tasks 2-5