2nd commit. Reconstruct some code.