Infrastructure

Do it right the first time.