Third Commit. Includes code.