All the issue #2 tasks have been implemented