Intermediate Commit

The first commit since the initial push. Another commit may be made,
depending on what can be accomplished within the remaining time
constraints.