Code Review of Initial Version

Alan sent me this as an attachment, and I'm committing it for him and doing a code review.