Second commit: Code marked as obsolete.  New code will be pushed to git.