Commit 2. The skeleton is coming along.