Work on issue #1 and issue #2. Done until /credits.